Fix(l10n): Update translations from Transifex

author Nextcloud bot <bot@nextcloud.com>

Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)

committer Nextcloud bot <bot@nextcloud.com>

Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)
author Nextcloud bot <bot@nextcloud.com>
Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)
committer Nextcloud bot <bot@nextcloud.com>
Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)
diff --git a/translations/client_ar.ts b/translations/client_ar.ts

index d21a8a73dc4d6694c3c5d9417510bb8e965e277c..ba7058cdc56e6781aafdb4adccf32843be578855 100644 (file)
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -234,6 +234,37 @@
          <translation>لا صور &quot;إيموجي&quot; مُؤخّراً</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -956,6 +987,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>لا توجد %1 اتصالات مُهيّأةٍ.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1479,6 +1515,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4308,6 +4364,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>نُقِلَ إلى مَقْصِد taget غير صالحٍ. إستعادة</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4347,13 +4408,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>تعذّر حذف الملف %1 من قاعدة البيانات المحلية</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>تعذّر حذف الملف %1 من قاعدة البيانات المحلية</translation>
      </message>
      <message>
@@ -5706,6 +5767,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6952,6 +7023,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>بيانات وصفية مٌحدَّثة للملفات الافتراضية المحلية local virtual files</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7028,6 +7104,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>تحديث البيانات الوصفية للمحلية للملفات الافتراضية</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_bg.ts b/translations/client_bg.ts

index 827892befe55a6c17625de6d5cfd8bd6e52857a2..afac3f22ea152a6ee7e9272d3c53597068277196 100644 (file)
--- a/translations/client_bg.ts
+++ b/translations/client_bg.ts
@@ -234,6 +234,37 @@
          <translation>Няма скорошни емотикони</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -957,6 +988,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Няма %1 конфигурирана връзка.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1479,6 +1515,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4312,6 +4368,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Преместено в невалидна цел, възстановява се</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,16 +4411,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>не можа да изтрие файл %1 от локалната БД /база данни/</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5712,6 +5773,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6958,6 +7029,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7034,6 +7110,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_br.ts b/translations/client_br.ts

index 57ae536bbbdc0af0c47a899caa507f8590096d1b..6512e3aaad31c878fb726e4bc1edd48a7b67b0c2 100644 (file)
--- a/translations/client_br.ts
+++ b/translations/client_br.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -952,6 +983,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Kesntagadenn %1 ebet lakaet.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1474,6 +1510,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4288,6 +4344,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4327,13 +4388,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5686,6 +5747,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6932,6 +7003,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7008,6 +7084,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ca.ts b/translations/client_ca.ts

index c69ed0b5427de01b14fc602d86de89ea3ed1b5d0..a821d5838e90efb6dab307f8848816116ac19735 100644 (file)
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -234,6 +234,37 @@
          <translation>No hi ha emojis recents</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -957,6 +988,11 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
          <source>No %1 connection configured.</source>
          <translation>No s&apos;ha configurat cap connexió a %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1479,6 +1515,26 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4289,6 +4345,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>S&apos;ha mogut a una destinació no vàlida; s&apos;està restaurant</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4328,13 +4389,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5687,6 +5748,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6933,6 +7004,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7009,6 +7085,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts

index dc2866ab0a8e19b974f0161bc2830259a6b638a7..0bd3f0b9312102ab9f9c175087683781904261e9 100644 (file)
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -234,6 +234,37 @@
          <translation>Žádné nedávno použité emotikony</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -960,6 +991,11 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
          <source>No %1 connection configured.</source>
          <translation>Nenastaveno žádné připojení k %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1483,6 +1519,26 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4330,6 +4386,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
          <source>Moved to invalid target, restoring</source>
          <translation>Přesunuto do neplatného cíle – obnovuje se</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4368,16 +4429,16 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Nepodařilo se smazat soubor %1 lokální databáze</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>nepodařilo se smazat soubor %1 lokální databáze</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Nepodařilo se smazat soubor %1 lokální databáze</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5730,6 +5791,16 @@ Server odpověděl chybou: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6976,6 +7047,11 @@ Server odpověděl chybou: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Místní metadata virtuálních souborů zaktualizována</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7052,6 +7128,11 @@ Server odpověděl chybou: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Aktualizace místních metadat virtuálních souborů</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_da.ts b/translations/client_da.ts

index d919d0502fa2c2a5d8f70bfea15a70dd4321424d..2c98ead16b61ff2cb8db47a10adf3174b64e5281 100644 (file)
--- a/translations/client_da.ts
+++ b/translations/client_da.ts
@@ -234,6 +234,37 @@
          <translation>Ingen nylige emojis</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -960,6 +991,11 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
          <source>No %1 connection configured.</source>
          <translation>Ingen %1 forbindelse konfigureret.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1483,6 +1519,26 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4298,6 +4354,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4337,13 +4398,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5696,6 +5757,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6942,6 +7013,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7018,6 +7094,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_de.ts b/translations/client_de.ts

index e47b95f03e7b25959261b235d2acf0de25646a75..7658ccd5be68580d800743408789b345701ac722 100644 (file)
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -234,6 +234,37 @@
          <translation>Keine aktuellen Emojis</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -960,6 +991,11 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
          <source>No %1 connection configured.</source>
          <translation>Keine %1-Verbindung konfiguriert.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1483,6 +1519,26 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4330,6 +4386,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
          <source>Moved to invalid target, restoring</source>
          <translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4368,16 +4429,16 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Datei %1 konnte nicht aus der lokalen Datenbank gelöscht werden</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>Datei %1 konnte nicht aus lokaler Datenbank gelöscht werden</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Datei %1 konnte nicht aus der lokalen Datenbank gelöscht werden</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5730,6 +5791,16 @@ Server antwortete mit Fehler: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6976,6 +7047,11 @@ Server antwortete mit Fehler: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Metadaten für lokale virtuelle Dateien aktualisiert</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7052,6 +7128,11 @@ Server antwortete mit Fehler: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Aktualisiere Metadaten für lokale virtuelle Dateien</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_el.ts b/translations/client_el.ts

index 452198de5ad32336791813c11c4c20dac7117780..084985037ef5d20b9f3155e7f6e35b50d77224c5 100644 (file)
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -952,6 +983,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1474,6 +1510,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4296,6 +4352,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4335,13 +4396,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5694,6 +5755,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6940,6 +7011,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7016,6 +7092,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts

index f70c516628834f557db7f61581d7b1ec8ace38f8..653e283af90244a5801fd75703654f5ea2daaa38 100644 (file)
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -234,6 +234,37 @@
          <translation>No recent emojis</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</translation>
          <source>No %1 connection configured.</source>
          <translation>No %1 connection configured.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Moved to invalid target, restoring</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,16 +4431,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Could not delete file %1 from local DB</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>could not delete file %1 from local DB</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Could not delete file %1 from local DB</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5732,6 +5793,16 @@ Server replied with error: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ Server replied with error: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Updated local virtual files metadata</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ Server replied with error: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Updating local virtual files metadata</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_eo.ts b/translations/client_eo.ts

index 32a855b7c465b4775dd11a32d891431608be0e29..b2183135224e979a5b3d5ad6aefe814ff14c3b5a 100644 (file)
--- a/translations/client_eo.ts
+++ b/translations/client_eo.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Neniu konekto al %1 agordita.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4287,6 +4343,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4326,13 +4387,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5684,6 +5745,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6930,6 +7001,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7006,6 +7082,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es.ts b/translations/client_es.ts

index d2cc3c1b58185c0ceb2b1fa1a036e56f68f520f1..0b826f2fd54439d85cbf971598f6446363d66567 100644 (file)
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -234,6 +234,37 @@
          <translation>No hay emojis recientes</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -962,6 +993,11 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
          <source>No %1 connection configured.</source>
          <translation>No hay ninguna conexión de %1 configurada.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1485,6 +1521,26 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4331,6 +4387,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
          <source>Moved to invalid target, restoring</source>
          <translation>Movido a un lugar no válido, restaurando</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4369,16 +4430,16 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>no fue posible borrar el archivo %1 de la base de datos local</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5731,6 +5792,16 @@ El servidor respondió con el error: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6977,6 +7048,11 @@ El servidor respondió con el error: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Se han actualizado los metadatos para los archivos virtuales</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7053,6 +7129,11 @@ El servidor respondió con el error: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Actualizando los metadatos locales de los archivos virtuales</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts

index ff7a3756e0239ddef7e76ea858e353dc71073a54..8ad4204f7c8ffd5fdc68c5787945314dfd083a4d 100644 (file)
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts

index f1664093c59c165e200134a7d9bff70c36e40c6e..290388212619b2389eeff6d52a56fcbc1b97250e 100644 (file)
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts

index e1aef83521e3fdd18610335ded20fee465b89ec1..36b9031bb5198eff568d199a41711c194129c403 100644 (file)
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts

index 426630fd2df15998a314021dd90e6353b1c925f5..b23a3be85a93e15c5445c546a8f0e2a7ae60564d 100644 (file)
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts

index 459d53389d0ba47cd829ac42de1f616ab37d05d1..c8454522305180e3386437a886b411662061bd21 100644 (file)
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@@ -234,6 +234,37 @@
          <translation>No hay emojis recientes</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -958,6 +989,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1480,6 +1516,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4312,6 +4368,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Movido a un destino no válido, se está restaurando</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,16 +4411,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>No se pudo eliminar el archivo %1 de la base de datos local</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5712,6 +5773,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6958,6 +7029,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7034,6 +7110,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts

index c7c154cdc816e80ea1241ff6b7eb3587e5bf2f3f..4dd0f365b20b5bf00879ca4c4b18fc6c776f19d1 100644 (file)
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@@ -234,6 +234,37 @@
          <translation>No hay emojis recientes</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts

index d7479fa3666d634fd9370bcec516721cd2b107bd..878b54d9f993067220832849965fcaf12a20b041 100644 (file)
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts

index 714fcbe32e24300974c112b92296c1d8af02f553..93075b0c356aa70685e3a9732398b4800865b984 100644 (file)
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@@ -234,6 +234,37 @@
          <translation>No hay emoticonos recientes</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4318,6 +4374,11 @@ Este es un modo nuevo y experimental. Si decide usarlo, por favor informe cualqu
          <source>Moved to invalid target, restoring</source>
          <translation>Movido a un destino inválido, restaurando</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4356,16 +4417,16 @@ Este es un modo nuevo y experimental. Si decide usarlo, por favor informe cualqu
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>no se pudo eliminar el archivo %1 de la base de datos local</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5718,6 +5779,16 @@ El servidor respondió con el error: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6964,6 +7035,11 @@ El servidor respondió con el error: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Metadatos de los archivos virtuales locales actualizados</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7040,6 +7116,11 @@ El servidor respondió con el error: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Actualizando los metadatos locales de los archivos virtuales</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts

index acfa4e162cc8606ce62d0fe0136b351fd5236335..88483610e04650184e73c7ac030345985eddd673 100644 (file)
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>No hay %1 conexión configurada. </translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4279,6 +4335,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4318,13 +4379,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5677,6 +5738,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6923,6 +6994,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6999,6 +7075,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts

index 15293f9dafe926a721bb8ba62cbf12204acea171..36c12fa0e1879338cc814c51f68f646b59c64021 100644 (file)
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -234,6 +234,37 @@
          <translation>Ez dago azken emojirik</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
          <source>No %1 connection configured.</source>
          <translation>Ez dago %1 konexiorik konfiguratuta.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4328,6 +4384,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
          <source>Moved to invalid target, restoring</source>
          <translation>Baliogabeko helburura mugitu da, berrezartzen</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4367,13 +4428,13 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>Ezin izan da %1 fitxategia datu-base lokaletik ezabatu</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>Ezin izan da %1 fitxategia datu-base lokaletik ezabatu</translation>
      </message>
      <message>
@@ -5728,6 +5789,16 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6974,6 +7045,11 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Fitxategi lokal birtualen metadatu eguneratuak</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7050,6 +7126,11 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Fitxategi lokal birtualen metadatuak eguneratzen</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts

index e29dbcaa9cd6b39b1bfff5d688b8d2bd5f625af9..0b0c3b1c609ab02b321faf02d6201f1be97a9d5f 100644 (file)
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -234,6 +234,37 @@
          <translation>هیچ اموجی اخیری وجود ندارد</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -958,6 +989,11 @@ This action will abort any currently running synchronization.</translation>
          <source>No %1 connection configured.</source>
          <translation>بدون %1 اتصال پیکربندی شده.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1480,6 +1516,26 @@ This action will abort any currently running synchronization.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4312,6 +4368,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Moved to invalid target, restoring</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,16 +4411,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>could not delete file %1 from local DB</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5711,6 +5772,16 @@ Server replied with error: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6957,6 +7028,11 @@ Server replied with error: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7033,6 +7109,11 @@ Server replied with error: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts

index 2dbe34569471461e89545622248dafba09973562..1521ee788f34843015cc8b5b9483589b7c553eb3 100644 (file)
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -955,6 +986,11 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
          <source>No %1 connection configured.</source>
          <translation>%1-yhteyttä ei ole määritelty.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1477,6 +1513,26 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4290,6 +4346,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4329,13 +4390,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5688,6 +5749,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6934,6 +7005,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7010,6 +7086,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts

index caf364efeb77206e30b5a6fd69261e4e44d74594..dfb370219d3790e120558021b920042d498ca10a 100644 (file)
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -234,6 +234,37 @@
          <translation>Pas d&apos;émojis récents</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -959,6 +990,11 @@ Vous prenez vos propres risques.</translation>
          <source>No %1 connection configured.</source>
          <translation>Aucune connexion à %1 configurée</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1482,6 +1518,26 @@ Vous prenez vos propres risques.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -2043,7 +2099,7 @@ Cela peut être un problème avec vos bibliothèques OpenSSL.</translation>
      <message>
          <location filename="../src/gui/wizard/flow2authwidget.cpp" line="222"/>
          <source>Open Browser</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir le navigateur</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/flow2authwidget.cpp" line="224"/>
@@ -2449,7 +2505,7 @@ Vous pouvez également restaurer tous les fichiers supprimés en les télécharg
      <message>
          <location filename="../src/gui/folderman.cpp" line="1810"/>
          <source>The folder %1 is used in a folder sync connection!</source>
-        <translation type="unfinished"/>
+        <translation>Le dossier %1 est utilisé dans une connexion de synchronisation de dossiers !</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1656"/>
@@ -4327,6 +4383,11 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
          <source>Moved to invalid target, restoring</source>
          <translation>Déplacé vers une cible invalide, restauration</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4366,13 +4427,13 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>Impossible de supprimer le fichier %1 de la base de données locale</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>Impossible de supprimer le fichier %1 de la base de données locale</translation>
      </message>
      <message>
@@ -5727,6 +5788,16 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -5884,7 +5955,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
      <message>
          <location filename="../src/common/vfs.cpp" line="75"/>
          <source>The Virtual filesystem feature does not support a drive as sync root</source>
-        <translation type="unfinished"/>
+        <translation>La fonction de système de fichiers virtuel ne prend pas en charge un lecteur en tant que racine de synchronisation.</translation>
      </message>
      <message>
          <location filename="../src/common/vfs.cpp" line="75"/>
@@ -5894,7 +5965,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
      <message>
          <location filename="../src/common/vfs.cpp" line="83"/>
          <source>The Virtual filesystem feature is not supported on network drives</source>
-        <translation type="unfinished"/>
+        <translation>La fonction de système de fichiers virtuel n&apos;est pas prise en charge sur les lecteurs réseau.</translation>
      </message>
  </context>
  <context>
@@ -6494,7 +6565,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
      <message>
          <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="469"/>
          <source>Password protection</source>
-        <translation type="unfinished"/>
+        <translation>Protection par mot de passe</translation>
      </message>
      <message>
          <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="516"/>
@@ -6973,6 +7044,11 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Fichiers locaux virtuels de métadonnées mis à jour</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7049,6 +7125,11 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Mise à jour des méta-données des fichiers virtuels</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ga.ts b/translations/client_ga.ts

index 4289f33a44bd114472f11e08a5a44f9894b311f9..067a0a9617f0091cac7e3ef18b6fa2a4ee18e5c3 100644 (file)
--- a/translations/client_ga.ts
+++ b/translations/client_ga.ts
@@ -234,6 +234,37 @@
          <translation>Gan emojis le déanaí</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Cuirfidh an gníomh seo deireadh le haon sioncrónú atá ar siúl faoi láthair
          <source>No %1 connection configured.</source>
          <translation>Níl ceangal % 1 cumraithe.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Cuirfidh an gníomh seo deireadh le haon sioncrónú atá ar siúl faoi láthair
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ Is modh turgnamhach nua é seo. Má shocraíonn tú é a úsáid, cuir in iúl l
          <source>Moved to invalid target, restoring</source>
          <translation>Bogtha go dtí an sprioc neamhbhailí, á athchóiriú</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,16 +4431,16 @@ Is modh turgnamhach nua é seo. Má shocraíonn tú é a úsáid, cuir in iúl l
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Níorbh fhéidir comhad %1 a scriosadh ó DB logánta</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>Níorbh fhéidir comhad % 1 a scriosadh ó DB logánta</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Níorbh fhéidir comhad %1 a scriosadh ó DB logánta</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5732,6 +5793,16 @@ D&apos;fhreagair an freastalaí le hearráid: % 2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ D&apos;fhreagair an freastalaí le hearráid: % 2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Meiteashonraí comhaid fhíorúla áitiúla nuashonraithe</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ D&apos;fhreagair an freastalaí le hearráid: % 2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Meiteashonraí comhaid fhíorúla áitiúla á nuashonrú</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts

index 2013b6bcb1e78008ac855773c5fb21017c96647f..f0e5f68c94f8a3de6ce79b8fe6f6951eef76a7d7 100644 (file)
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -234,6 +234,37 @@
          <translation>Non hai «emojis» recentes</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
          <source>No %1 connection configured.</source>
          <translation>Non se configurou a conexión %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4331,6 +4387,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
          <source>Moved to invalid target, restoring</source>
          <translation>Moveuse a un destino non válido, restaurándo</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4369,16 +4430,16 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Non foi posíbel eliminar o ficheiro %1 da BD local</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>non foi posíbel eliminar o ficheiro %1 da base de datos local</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Non foi posíbel eliminar o ficheiro %1 da BD local</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5731,6 +5792,16 @@ O servidor respondeu co erro: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6977,6 +7048,11 @@ O servidor respondeu co erro: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Actualizados os metadatos dos ficheiros virtuais locais</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7053,6 +7129,11 @@ O servidor respondeu co erro: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Actualizando os metadatos dos ficheiros virtuais locais</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_he.ts b/translations/client_he.ts

index c9b6475051f583fb33a22ad361914d96cd25424b..89ee2fff99bdddc91a614223fbafb022273122d0 100644 (file)
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -952,6 +983,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>אין הגדרה לחיבור %1</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1474,6 +1510,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4284,6 +4340,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4323,13 +4384,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5682,6 +5743,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6928,6 +6999,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7004,6 +7080,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_hr.ts b/translations/client_hr.ts

index 81871c744d789a90dfbdd3cdbb1496c22b8183d0..2538fcfb1ccfb38549152e48937c80e6931c14e0 100644 (file)
--- a/translations/client_hr.ts
+++ b/translations/client_hr.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -956,6 +987,11 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
          <source>No %1 connection configured.</source>
          <translation>Nije konfigurirana veza %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1478,6 +1514,26 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4311,6 +4367,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
          <source>Moved to invalid target, restoring</source>
          <translation>Premješteno na nevažeće odredište, vraćanje</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,13 +4411,13 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5709,6 +5770,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6955,6 +7026,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7031,6 +7107,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts

index c0e2235ad7b2969d44bb279aa7d2933bb67d9bf6..10c7dcac22f3da95025e8d01f4a0f70daf9a73ee 100644 (file)
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -234,6 +234,37 @@
          <translation>Nincsenek nemrég használt emodzsik</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
          <source>No %1 connection configured.</source>
          <translation>Nincs %1 kapcsolat beállítva.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4333,6 +4389,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
          <source>Moved to invalid target, restoring</source>
          <translation>Érvénytelen célba mozgatás, helyreállítás</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4371,16 +4432,16 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>A(z) %1 fájl törlése a helyi adatbázisból nem sikerült</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>a(z) %1 fájl törlése a helyi adatbázisból nem sikerült</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>A(z) %1 fájl törlése a helyi adatbázisból nem sikerült</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5733,6 +5794,16 @@ A kiszolgáló hibával válaszolt: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6979,6 +7050,11 @@ A kiszolgáló hibával válaszolt: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Frissített helyi virtuális fájlok metaadatai</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7055,6 +7131,11 @@ A kiszolgáló hibával válaszolt: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>A helyi virtuális fájlok metaadatainak frissítése</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_is.ts b/translations/client_is.ts

index 309a81818960dc27f681b5b1a7828bfd881649f4..3e2a9c84f8ba6fe1f89408aa2d833e4fe289d5b9 100644 (file)
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@@ -234,6 +234,37 @@
          <translation>Engin nýleg tjákn</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -957,6 +988,11 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla
          <source>No %1 connection configured.</source>
          <translation>Engin %1 tenging skilgreind.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1481,6 +1517,26 @@ gagnageymslur: </translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4292,6 +4348,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4331,13 +4392,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5690,6 +5751,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6937,6 +7008,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7013,6 +7089,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_it.ts b/translations/client_it.ts

index 6663c22c0624be14799e9d7a4032e51b6bdf6c6e..c93add1ab5a770ed3eb8077dad218b629f1d9efd 100644 (file)
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -234,6 +234,37 @@
          <translation>Nessun emoji recente</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
          <source>No %1 connection configured.</source>
          <translation>Nessuna connessione di %1 configurata.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4324,6 +4380,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Spostato su una destinazione non valida, ripristino</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4362,16 +4423,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Impossibile eliminare il file %1 dal DB locale</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>impossibile eliminare il file %1 dal DB locale</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Impossibile eliminare il file %1 dal DB locale</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5724,6 +5785,16 @@ Il server ha risposto con errore: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6970,6 +7041,11 @@ Il server ha risposto con errore: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Metadati dei file virtuali locali aggiornati</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7046,6 +7122,11 @@ Il server ha risposto con errore: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Aggiornamento dei metadati dei file virtuali locali</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts

index 292475143caa32538c7a756b2ab58f629ccc942c..079d2242f7b7deeb178b3284d4b80eb448a8f5a3 100644 (file)
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -234,6 +234,37 @@
          <translation>最近の絵文字はありません</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>%1 の接続は設定されていません。</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4331,6 +4387,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>無効なターゲットに移動し、復元しました</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,13 +4431,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>ローカルDBからファイル %1 を削除できませんでした</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>ローカルDBからファイル %1 を削除できませんでした</translation>
      </message>
      <message>
@@ -5731,6 +5792,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6977,6 +7048,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>更新されたローカル仮想ファイルのメタデータ</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7053,6 +7129,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>ローカル仮想ファイルメタデータの更新</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts

index 69cc9904880f0e4565ec2e24cbbbafdb7d37573f..5a2af0339678997470161a3089665e3e71bdba6d 100644 (file)
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -234,6 +234,37 @@
          <translation>최근 이모지 없음</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -960,6 +991,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>%1 연결이 설정되지 않았습니다.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1483,6 +1519,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4330,6 +4386,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>유효하지 않은 목적지로 옮겨짐, 복구</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4368,16 +4429,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>로컬 DB에서 %1 파일을 제거할 수 없습니다.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>로컬 데이터베이스에서 파일 %1을(를) 삭제할 수 없음</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>로컬 DB에서 %1 파일을 제거할 수 없습니다.</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5730,6 +5791,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6976,6 +7047,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>로컬 가상 파일 메타데이터 업데이트함</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7052,6 +7128,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>로컬 가상 파일 메타데이터 업데이트함</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts

index 316b7afc282e1dd759de2182d997948aceea6bee..bef3ade83a4b0d7cd980593e68a38145416a297d 100644 (file)
--- a/translations/client_lt_LT.ts
+++ b/translations/client_lt_LT.ts
@@ -234,6 +234,37 @@
          <translation>Nėra paskiausiai naudotų šypsenėlių</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -952,6 +983,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Nesukonfigūruota %1  sujungimų.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1474,6 +1510,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4288,6 +4344,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4327,13 +4388,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5686,6 +5747,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6932,6 +7003,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7008,6 +7084,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_lv.ts b/translations/client_lv.ts

index 31680e88fe60fff1be19fdd6d203d4196128a0df..7aea60a1184ceda9850167f2d1a273e6dd2762ab 100644 (file)
--- a/translations/client_lv.ts
+++ b/translations/client_lv.ts
@@ -234,6 +234,37 @@
          <translation>Nav nesen izmantotu emoji.</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Vienīgā priekšrocība, izslēdzot virtuālo datņu atbalstu, ir tas, ka atkal
          <source>No %1 connection configured.</source>
          <translation>Nav %1 savienojums konfigurēts.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Vienīgā priekšrocība, izslēdzot virtuālo datņu atbalstu, ir tas, ka atkal
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4299,6 +4355,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4338,13 +4399,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5695,6 +5756,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6941,6 +7012,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7017,6 +7093,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_mk.ts b/translations/client_mk.ts

index d965b5e09dc17df85b07e99772f9c09449f89c01..fa8c5a21f8b78f87f3dc81a6c5b52d345172c7f4 100644 (file)
--- a/translations/client_mk.ts
+++ b/translations/client_mk.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Нема конфигурирано %1 врска.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4286,6 +4342,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4325,13 +4386,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5684,6 +5745,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6930,6 +7001,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7006,6 +7082,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts

index d27416f601c60188252c29919d6ab6dc2606dd38..684e79c05dcabf206dcdc94472346b0dc0a58eb8 100644 (file)
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -234,6 +234,37 @@
          <translation>Ingen nylige emojier</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
          <source>No %1 connection configured.</source>
          <translation>Ingen %1-forbindelse konfigurert.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4317,6 +4373,11 @@ Dette er en ny, eksperimentell modus. Hvis du bestemmer deg for å bruke den, ve
          <source>Moved to invalid target, restoring</source>
          <translation>Flyttet til ugyldig mål, gjenoppretter</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4355,16 +4416,16 @@ Dette er en ny, eksperimentell modus. Hvis du bestemmer deg for å bruke den, ve
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>kunne ikke slette filen %1 fra lokal DB</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5717,6 +5778,16 @@ Server svarte med feil: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6963,6 +7034,11 @@ Server svarte med feil: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Oppdaterte lokale metadata for virtuelle filer</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7039,6 +7115,11 @@ Server svarte med feil: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Oppdaterer metadata for lokale virtuelle filer</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts

index f1124a421ce8d49759aca292261c7561909820a8..9f55805a0794ffc2680eba3cfb6f8402175548de 100644 (file)
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -234,6 +234,37 @@
          <translation>Geen recente emojis</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -957,6 +988,11 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
          <source>No %1 connection configured.</source>
          <translation>Geen %1 connectie geconfigureerd.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1480,6 +1516,26 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4314,6 +4370,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
          <source>Moved to invalid target, restoring</source>
          <translation>Verplaatst naar ongeldig doel, herstellen</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4352,16 +4413,16 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>kon bestand %1 niet verwijderen uit de lokale DB</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5714,6 +5775,16 @@ Server antwoordde met fout: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6960,6 +7031,11 @@ Server antwoordde met fout: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Lokale virtuele bestanden metadata geüploaded</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7036,6 +7112,11 @@ Server antwoordde met fout: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Bijwerken lokale virtuele bestanden metadata</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_oc.ts b/translations/client_oc.ts

index 5a3a711435d5807fcf525c17e4d6d1cbb8f80500..b181e0f5264682e223809759420f2afaa7726cde 100644 (file)
--- a/translations/client_oc.ts
+++ b/translations/client_oc.ts
@@ -234,6 +234,37 @@
          <translation>Cap d’emoji recents</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -951,6 +982,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Cap de connexion %1 configurat.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1473,6 +1509,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4277,6 +4333,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4316,13 +4377,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5675,6 +5736,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6921,6 +6992,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -6997,6 +7073,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts

index 5137fb5696259b26541c4cced1f9984b99f575cc..b0d3a5ecc0c52bbf7594c572a77836bb1708d60b 100644 (file)
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -234,6 +234,37 @@
          <translation>Brak najnowszych emoji</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
          <source>No %1 connection configured.</source>
          <translation>Nie skonfigurowano połączenia %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4318,6 +4374,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
          <source>Moved to invalid target, restoring</source>
          <translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4356,16 +4417,16 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>Nie można usunąć pliku %1 z lokalnej bazy danych</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5718,6 +5779,16 @@ Serwer odpowiedział błędem: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6964,6 +7035,11 @@ Serwer odpowiedział błędem: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7040,6 +7116,11 @@ Serwer odpowiedział błędem: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts

index 60dd1bacf227824750d3c0b0d4cf4978ccfa76f2..8b39dba78f611827fee38904aca97fba57733315 100644 (file)
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -234,6 +234,37 @@
          <translation>Nenhum emoji recente</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -952,6 +983,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>%1 sem ligação configurada.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1474,6 +1510,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4282,6 +4338,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4321,13 +4382,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5680,6 +5741,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6926,6 +6997,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7002,6 +7078,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts

index b98545c8b83e9582f37e5fb83e73d225623b61ff..6f71daf4727d709df58517d0c1cb5485e1dc5a5d 100644 (file)
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -234,6 +234,37 @@
          <translation>Nenhum emoji recente</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -958,6 +989,11 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
          <source>No %1 connection configured.</source>
          <translation>Nenhuma conexão %1 configurada.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1480,6 +1516,26 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4323,6 +4379,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
          <source>Moved to invalid target, restoring</source>
          <translation>Movido para destino inválido, restaurando </translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4361,16 +4422,16 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Não foi possível remover o arquivo %1 do BD local</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>não foi possível eliminar o arquivo %1 do BD local</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Não foi possível remover o arquivo %1 do BD local</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5723,6 +5784,16 @@ Servidor respondeu com erro: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6969,6 +7040,11 @@ Servidor respondeu com erro: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Metadados de arquivos virtuais locais atualizados</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7045,6 +7121,11 @@ Servidor respondeu com erro: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Atualizando metadados de arquivos virtuais locais</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ro.ts b/translations/client_ro.ts

index 5b13eda51bef62c1660d28d7789f4bfb92780c27..4ca3688a3d843f9bcc11efe9451b7c3541fffe66 100644 (file)
--- a/translations/client_ro.ts
+++ b/translations/client_ro.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -956,6 +987,11 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
          <source>No %1 connection configured.</source>
          <translation>Nu există nici-o conexiune configurată la %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1478,6 +1514,26 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4294,6 +4350,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4333,13 +4394,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5690,6 +5751,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6936,6 +7007,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7012,6 +7088,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts

index c8f4ab469ceecb174ddab730b1d986bb0a8d72b0..295ab563b4396ef92f5a8f283d9352d7dac4f538 100644 (file)
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -234,6 +234,37 @@
          <translation>Нет ни одного недавно использованного эмодзи</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -959,6 +990,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Нет настроенного подключения %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1482,6 +1518,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4323,6 +4379,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Перемещено в некорректное расположение, выполняется восстановление</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4361,16 +4422,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Не удалось удалить файл %1 из локальной базы данных</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>не удалось удалить файл %1 из локальной базы данных</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Не удалось удалить файл %1 из локальной базы данных</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5723,6 +5784,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6969,6 +7040,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>Метаданные виртуальных файлов обновлены</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7045,6 +7121,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>Обновление метаданных локальных виртуальных файлов</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_sc.ts b/translations/client_sc.ts

index 9b4cfe54ea75695d270a7d1614e68a7b7a624822..358e5e495dcd755891b1c4b132e3a44b5154fd1c 100644 (file)
--- a/translations/client_sc.ts
+++ b/translations/client_sc.ts
@@ -234,6 +234,37 @@
          <translation type="unfinished"/>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -956,6 +987,11 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
          <source>No %1 connection configured.</source>
          <translation>Perunu connessione %1 configurada.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1478,6 +1514,26 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4311,6 +4367,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
          <source>Moved to invalid target, restoring</source>
          <translation>Tramudadu a un&apos;indiritzu non bàlidu, riprìstinu</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,13 +4411,13 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5709,6 +5770,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6955,6 +7026,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7031,6 +7107,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts

index 11f36faf20d6cf468165dee93432052d97f379ee..616f15b5a6b024da0e011b583d91570413b0ec83 100644 (file)
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -234,6 +234,37 @@
          <translation>Žiadne nedávne emotikony</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
          <source>No %1 connection configured.</source>
          <translation>Žiadne nakonfigurované  %1 spojenie</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
          <source>Moved to invalid target, restoring</source>
          <translation>Presunuté do neplatného cieľa, obnovujem</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,16 +4431,16 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Nie je možné vymazať súbor %1 z lokálnej DB</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>nie je možné vymazať súbor %1 z lokálnej DB</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Nie je možné vymazať súbor %1 z lokálnej DB</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5732,6 +5793,16 @@ Server odpovedal chybou: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ Server odpovedal chybou: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Lokálne metadáta virtuálných súborov boli aktualizované</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ Server odpovedal chybou: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Aktualizujú sa lokálne metadáta virtuálných súborov</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts

index 3cb7440a2393658947938f2c8ce3e5071c5eecdb..d0ffa991c37c6394b1e78d3951e6632126cc347d 100644 (file)
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -234,6 +234,37 @@
          <translation>Ni nedavnih izraznih ikon</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -956,6 +987,11 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
          <source>No %1 connection configured.</source>
          <translation>Ni nastavljene povezave %1.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1478,6 +1514,26 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4311,6 +4367,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
          <source>Moved to invalid target, restoring</source>
          <translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4350,13 +4411,13 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5709,6 +5770,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6955,6 +7026,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7031,6 +7107,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts

index a19fe3eba7e5302061ed3b4c3e1e452c97401c57..b76109db83013454ca3fae38bf8b595f1650629a 100644 (file)
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -234,6 +234,37 @@
          <translation>Нема скорашњих емођија</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Нема подешене %1 везе.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Премештено на неисправан циљ, враћа се</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,16 +4431,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Фајл %1 не може да се обрише из локалне базе</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>фајл %1 не може да се обрише из локалне базе</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Фајл %1 не може да се обрише из локалне базе</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5732,6 +5793,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>Ажурирани су метаподаци локалних виртуелних фајлова</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>Ажурирају се метаподаци локалних виртуелних фајлова</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts

index 45a9bc1a2eee4a4a6fa329749bfd510c2e07375d..0f059ff1e9b2f1d410a8c02f29ea9acfb05f1b0e 100644 (file)
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -234,6 +234,37 @@
          <translation>Inga nya emojis</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Den här åtgärden avbryter alla pågående synkroniseringar.</translation>
          <source>No %1 connection configured.</source>
          <translation>Ingen %1 anslutning konfigurerad.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Den här åtgärden avbryter alla pågående synkroniseringar.</translation>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
          <source>Moved to invalid target, restoring</source>
          <translation>Flyttade till ogiltigt mål, återställer</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4371,13 +4432,13 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>Kunde inte ta bort filen %1 från lokal DB</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>Kunde inte ta bort filen %1 från lokal DB</translation>
      </message>
      <message>
@@ -5732,6 +5793,16 @@ Servern svarade med fel: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ Servern svarade med fel: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Uppdaterad metadata för lokala virtuella filer</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ Servern svarade med fel: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Uppdaterar lokala virtuella filers metadata</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_th.ts b/translations/client_th.ts

index 6b4b859ca416779bfd28ab96ae83ba3355034ac0..d212e417eebdb9248b557a1d50817f42f1ff909d 100644 (file)
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -234,6 +234,37 @@
          <translation>ไม่มีอีโมจิล่าสุด</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -955,6 +986,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1477,6 +1513,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4287,6 +4343,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4326,13 +4387,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation type="unfinished"/>
      </message>
      <message>
@@ -5684,6 +5745,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6930,6 +7001,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7006,6 +7082,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts

index 5637f710ae71a5b0257c7e5af20035fd395bc39a..9e36eaf5384f1864c21aceb8c60d3c80eb6fadae 100644 (file)
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -234,6 +234,37 @@
          <translation>Kullanılmış bir emoji yok</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
          <source>No %1 connection configured.</source>
          <translation>Henüz bir %1 bağlantısı yapılandırılmamış.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4331,6 +4387,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
          <source>Moved to invalid target, restoring</source>
          <translation>Geçersiz bir hedefe taşındı, geri yükleniyor</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4370,13 +4431,13 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>%1 dosyası yerel veri tabanından silinemedi</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>%1 dosyası yerel veri tabanından silinemedi</translation>
      </message>
      <message>
@@ -5731,6 +5792,16 @@ Sunucunun verdiği hata yanıtı: %2</translation>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6977,6 +7048,11 @@ Sunucunun verdiği hata yanıtı: %2</translation>
          <source>Updated local virtual files metadata</source>
          <translation>Yerel sanal dosyalar üst verileri güncellendi</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7053,6 +7129,11 @@ Sunucunun verdiği hata yanıtı: %2</translation>
          <source>Updating local virtual files metadata</source>
          <translation>Yerel sanal dosyaların üst verileri güncelleniyor</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_ug.ts b/translations/client_ug.ts

index 478313c3412b1027277e6da25caf02f63ed4a905..30de7d865f1647d2da2a831952e54164df39acfb 100644 (file)
--- a/translations/client_ug.ts
+++ b/translations/client_ug.ts
@@ -234,6 +234,37 @@
          <translation>يېقىنقى emojis يوق</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>% 1 ئۇلىنىش سەپلەنمىدى.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4329,6 +4385,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>ئىناۋەتسىز نىشانغا يۆتكەلدى ، ئەسلىگە كەلدى</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4367,16 +4428,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>يەرلىك DB دىن% 1 ھۆججەتنى ئۆچۈرەلمىدى</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5729,6 +5790,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6975,6 +7046,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>يەرلىك مەۋھۇم ھۆججەتلەرنىڭ مېتا سانلىق مەلۇماتلىرى يېڭىلاندى</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7051,6 +7127,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>يەرلىك مەۋھۇم ھۆججەتلەرنىڭ مېتا سانلىق مەلۇماتلىرىنى يېڭىلاش</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts

index 5a7e16844f1179b8184f7311c8e62f6583421f9a..df91249bbee1a0f97fe1ca548fe24b170c5651b5 100644 (file)
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -234,6 +234,37 @@
          <translation>Поки відсутні емоційки</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>Жодного %1 підключення не налаштовано.</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4330,6 +4386,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>Пересунено до недійсного призначення, буде відновлено</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4368,16 +4429,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>Неможливо вилучити файл %1 з локальної БД</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>неможливо вилучити файл %1 з локальною БД</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>Неможливо вилучити файл %1 з локальної БД</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5730,6 +5791,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6976,6 +7047,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>Онолені метадані віртуальних файлів на пристрої</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7052,6 +7128,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>Оновлення метаданих віртуальних файлів на пристрої</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts

index 49292cf516f05b9ad8c8e5bfe00d2231a57bb0ca..612e38c7241d920bc861a88814c19d4a77ef04f4 100644 (file)
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -234,6 +234,37 @@
          <translation>没有最近使用的表情符号</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -957,6 +988,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>没有 %1 连接配置。</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1480,6 +1516,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4320,6 +4376,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>移动到无效目标，恢复中。</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4358,16 +4419,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  </context>
  <context>
      <name>OCC::PropagateDirectory</name>
-    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
-        <translation>无法从本地数据库中删除文件%1</translation>
-    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
          <source>could not delete file %1 from local DB</source>
          <translation>无法从本地数据库删除文件 %1</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
+        <translation>无法从本地数据库中删除文件%1</translation>
+    </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="1371"/>
          <source>Error updating metadata due to invalid modification time</source>
@@ -5720,6 +5781,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6966,6 +7037,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>已更新本地虚拟文件元数据</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7042,6 +7118,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>正在更新本地虚拟文件元数据</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts

index 897ccec5088559c0cc677a5a6aa310992106a715..29ab1a683ed06dde5ee783b195449dbc90cab167 100644 (file)
--- a/translations/client_zh_HK.ts
+++ b/translations/client_zh_HK.ts
@@ -234,6 +234,37 @@
          <translation>沒有最近的表情符號</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -962,6 +993,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>沒有 %1 連線設置。</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1487,6 +1523,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4333,6 +4389,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>已移至無效目標，正在還原</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4372,13 +4433,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>無法從近端數據庫中刪除檔案 %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>無法從近端數據庫中刪除檔案 %1</translation>
      </message>
      <message>
@@ -5733,6 +5794,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6979,6 +7050,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>近端虛擬元數據已更新</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7055,6 +7131,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>正在更新近端虛擬元數據</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts

index 0996684c44414261509b663e51195fc51c765c07..5003dc732b331cd5f5a09a57254d692d28c3ebc9 100644 (file)
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -234,6 +234,37 @@
          <translation>無最近的表情符號</translation>
      </message>
  </context>
+<context>
+    <name>EncryptionTokenDiscoveryDialog</name>
+    <message>
+        <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+        <source>Discovering the certificates stored on your USB token</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptionTokenSelectionWindow</name>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+        <source>Token Encryption Key Chooser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+        <source>Available Keys for end-to-end Encryption:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
  <context>
      <name>ErrorBox</name>
      <message>
@@ -961,6 +992,11 @@ This action will abort any currently running synchronization.</source>
          <source>No %1 connection configured.</source>
          <translation>未設定 %1 連線組態。</translation>
      </message>
+    <message>
+        <location filename="../src/gui/accountsettings.cpp" line="1533"/>
+        <source>Migrate certificate to a new one</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="1517"/>
          <source>There are folders that were not synchronized because they are too big: </source>
@@ -1484,6 +1520,26 @@ This action will abort any currently running synchronization.</source>
  </context>
  <context>
      <name>OCC::ClientSideEncryption</name>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+        <source>PIN needed to login to token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+        <source>Enter Certificate USB Token PIN:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+        <source>Invalid PIN. Login failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+        <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again !</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/clientsideencryption.cpp" line="1369"/>
          <source>Please enter your end-to-end encryption passphrase:&lt;br&gt;&lt;br&gt;Username: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
@@ -4332,6 +4388,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
          <source>Moved to invalid target, restoring</source>
          <translation>移動至無效目標，正在復原</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/discovery.cpp" line="1735"/>
+        <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/discovery.cpp" line="1637"/>
          <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
@@ -4371,13 +4432,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
  <context>
      <name>OCC::PropagateDirectory</name>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1428"/>
-        <source>Could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
+        <source>could not delete file %1 from local DB</source>
          <translation>無法從本機資料庫中刪除檔案 %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="1357"/>
-        <source>could not delete file %1 from local DB</source>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="1439"/>
+        <source>Could not delete file %1 from local DB</source>
          <translation>無法從本機資料庫中刪除檔案 %1</translation>
      </message>
      <message>
@@ -5732,6 +5793,16 @@ Server replied with error: %2</source>
  </context>
  <context>
      <name>OCC::User</name>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="104"/>
+        <source>End-to-end certificate needs to be migrated to a new one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/tray/usermodel.cpp" line="106"/>
+        <source>Trigger the migration</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/gui/tray/usermodel.cpp" line="158"/>
          <source>%1 notifications</source>
@@ -6978,6 +7049,11 @@ Server replied with error: %2</source>
          <source>Updated local virtual files metadata</source>
          <translation>更新了本機虛擬檔案詮釋資料</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+        <source>Updated end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="61"/>
          <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
@@ -7054,6 +7130,11 @@ Server replied with error: %2</source>
          <source>Updating local virtual files metadata</source>
          <translation>正在更新本機虛擬檔案中繼資料</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+        <source>Updating end-to-end encryption metadata</source>
+        <translation type="unfinished"/>
+    </message>
  </context>
  <context>
      <name>theme</name>
author	Nextcloud bot <bot@nextcloud.com>
	Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)
committer	Nextcloud bot <bot@nextcloud.com>
	Sat, 8 Feb 2025 03:00:57 +0000 (03:00 +0000)
translations/client_ar.ts		patch \| blob \| history
translations/client_bg.ts		patch \| blob \| history
translations/client_br.ts		patch \| blob \| history
translations/client_ca.ts		patch \| blob \| history
translations/client_cs.ts		patch \| blob \| history
translations/client_da.ts		patch \| blob \| history
translations/client_de.ts		patch \| blob \| history
translations/client_el.ts		patch \| blob \| history
translations/client_en_GB.ts		patch \| blob \| history
translations/client_eo.ts		patch \| blob \| history
translations/client_es.ts		patch \| blob \| history
translations/client_es_CL.ts		patch \| blob \| history
translations/client_es_CO.ts		patch \| blob \| history
translations/client_es_CR.ts		patch \| blob \| history
translations/client_es_DO.ts		patch \| blob \| history
translations/client_es_EC.ts		patch \| blob \| history
translations/client_es_GT.ts		patch \| blob \| history
translations/client_es_HN.ts		patch \| blob \| history
translations/client_es_MX.ts		patch \| blob \| history
translations/client_es_SV.ts		patch \| blob \| history
translations/client_eu.ts		patch \| blob \| history
translations/client_fa.ts		patch \| blob \| history
translations/client_fi.ts		patch \| blob \| history
translations/client_fr.ts		patch \| blob \| history
translations/client_ga.ts		patch \| blob \| history
translations/client_gl.ts		patch \| blob \| history
translations/client_he.ts		patch \| blob \| history
translations/client_hr.ts		patch \| blob \| history
translations/client_hu.ts		patch \| blob \| history
translations/client_is.ts		patch \| blob \| history
translations/client_it.ts		patch \| blob \| history
translations/client_ja.ts		patch \| blob \| history
translations/client_ko.ts		patch \| blob \| history
translations/client_lt_LT.ts		patch \| blob \| history
translations/client_lv.ts		patch \| blob \| history
translations/client_mk.ts		patch \| blob \| history
translations/client_nb_NO.ts		patch \| blob \| history
translations/client_nl.ts		patch \| blob \| history
translations/client_oc.ts		patch \| blob \| history
translations/client_pl.ts		patch \| blob \| history
translations/client_pt.ts		patch \| blob \| history
translations/client_pt_BR.ts		patch \| blob \| history
translations/client_ro.ts		patch \| blob \| history
translations/client_ru.ts		patch \| blob \| history
translations/client_sc.ts		patch \| blob \| history
translations/client_sk.ts		patch \| blob \| history
translations/client_sl.ts		patch \| blob \| history
translations/client_sr.ts		patch \| blob \| history
translations/client_sv.ts		patch \| blob \| history
translations/client_th.ts		patch \| blob \| history
translations/client_tr.ts		patch \| blob \| history
translations/client_ug.ts		patch \| blob \| history
translations/client_uk.ts		patch \| blob \| history
translations/client_zh_CN.ts		patch \| blob \| history
translations/client_zh_HK.ts		patch \| blob \| history
translations/client_zh_TW.ts		patch \| blob \| history